<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>
<body>
<<<<<<< HEAD
    <h1>嘿嘿嘿，我是第二次</h1>
=======
    <h1>中国前端数据天团第一次合作</h1>
>>>>>>> 0fdb3fea2308b6d78cccfbe7f34db118448f0150
    <h1>中国牛逼</h1>
</body>
</html>